More formatting and button changes.