Cleanup, fixed login button