Added sidebar, removed templating