modified app and moved login to right spot