More fixes and CSS edits