Minor bug fixes and CSS update