CSS fixes and fixes for issue #14