adapt for new layout
adapt to new layout