Cleaned up Login & Manage