A little cleanup, setup keyboard accelerators