Cleaning up menus and basic password change functionality