cleaned up login page formatting and added better navigation
resolved conflicts