Margin fixes
Settings button fix
Fix changing password
Little fixes
Change password fixes