modified layout and removed button for settings