Added Login and Account Pages and associates logic
Added login and account pages and logic; fixed merge errors