first merge of Mikhail with Brent and Cheryl
added back in login page