Bug fixes and CSS styling enhancements