Cleanup of CSS & HTML