Improved CSS and Edit