Added new templates and new pages, organized templates a little bit
Moved sidebar template