implemented new layout structure (WIP)