Another pass at the look & feel.