Fixed submenus
Actually, that if is irrelevant now