Bug fixes and css improvements