Sidebar + some fixes