More formatting and clean-up.
Adding meat behind the buttons.