Further edits on content and CSS