topbar links
topbar and sidebar styling done
Merge branch 'views2' into development