Cleaned up buttons a bit. Added wave notification when switching between waves.