Cleanup and replace methods in TheMenu with properties