Sidebar and small edits