Revert "Combat Menu Attack"

This reverts commit 20034e3efe432cb90d9885af7632d0a8a99f45bf.
Revert "Menu Button Recommit"

This reverts commit d5abb52733a826732475025acf9df12b5eb12f08.