Updated login window
Removed Conflict stuff