Move layout toggle buttons to display and update select button style

Part of #639 (closed). The deletion button move will be made later as it requires a more complex refactoring