Rejigging css and improving usability (I think...)