Removed iBeacon stuff for now
Fixed login (login now correctly displays options immediately)