Dried up the code some more. button actions are pretty clean