Improved CSS and added dynamic data collection