Styling Improvements and functionality enhancements