Polished the design a bit.