Add value labels
Reorganize buttons