finished functionality of new layout management