Part one of updating to separate sidebar and topbar