modified buttons and layout