tuned and consolidated the buttons a bit more