Cleaned up menu xml