update to settings layout and fixed refresh after setting save