Sidebar

Pull Sidebar features into master