Minor bug fixes and css changes