Added new login screen (and other changes)