Various tweaks and small css changes - testing needs revising and fixing