Change settings layout

Made some changes to UI