Lots of design tweaks.