Rearrange layout of action buttons. (Update and Goals were switched by accident somewhere down the line). Also, set up functions for Add Macroz math