Incorporated some of Cathy's remarks

Changing the wording of some things in the sidebar, and a small layout
optimisation.