changes to button arrangement
Merged, I think? Runs and has changes from both places
Not actually sure if there are any relevant changes here...