Refactoring: more touches at BuildLanOverview