Fixing things I accidentally broke, moving buttons