-progress on adding auto loading layouts