Fixing bad check-in

Fixed login first-time bug, moved System Reboot option to a safer
location.