Button fix and pruning

Just some layout fixes to buttons and pruning of left over material.
I'll put a bigger commit out by Saturday, most likely.