Cleaned up MenuMasterViewController and fixed some warnings