Updated layout for settings screen

Updated layout for settings screen