ticket:8 Main page template updated according to given mockup. Fixed some test issues.