Fixed CSS styles
Bug fixes and minor improvements