Issue 350

Fix for issue #350.

Also contains some css tidy-up.