rework layouts structure