More cleanup. Sidebar and default layout work.