Did a bit of cleanup and added a couple new modes
Menu also reacts to mouse now too!