New login and all html file consolidated into one login page