cleaned up the login and order a bit