fix new layout