Fix menu maintenance grid screen. Closes #38