Bug fix + 1st commit for sub menu window