Rolled back unnecessary menu changes