Improve CSS and minor edits