(iOS) Menu - some cleanups