Small bug fixes and css updating