More sidebar work.
Merging master templates and views.
WOrk on project and sidebar nearly complete.