Fix positiong of elements to use the new layout