Revert "changed menu to buttons for now, general cleanup of uneeded code from before"

This reverts commit dad377718f001e82c412187e49d4705c169efa1b.