Merge pull request #126 from amida-tech/unifying-navbar

unified navigation sidebars
fixed scroll working!