Redesign of main layout (change order of the buttons)