Cleaned up structure on menu items

[skip ci]
Feature - absolute timeout, stops fixing if time exceeded