rework on layouts to gain space