ACT-1397 and diagram view cleanup