Changed buttons and layout