Fix issues around changing from one statue to another
Cleaned up code in MenuManager