Additional CSS and cleaup