update branch: add missing scripts, collocation cloud, layout fixes