Bug fixes and CSS improvements