Added forgotten Menu checks