#5, improve a few more labels and buttons.