some bug fixes and css changes