added Main page
refactor Main page
Merge branch 'loginAndSignup' into phase1