Final clean-up and styling fixes.