Add a missing class and move where sidebar is drawn