Integrated the new improvements to the design.

Moved our customzations to master2.css.