level layout rework - wip