Improvements to the Widget HTML layout for better CSS Styling