Change ordering of buttons. Happiest to the right.
Improved comments