Improved the CSS id/class stuff.