CQ-123 Layout changed to be more consistent when resizing