Rearranged layout of the main controls.