Touch-up to make everything functional and pretty.