buttons and new layout