#586 - split builder screens into two urls