Fixed Login Button

Cleaned up code and moved login button