Moved sidebar and top bar to seperate template files and added them to required pages.