Move to layout system, test dropped suffixes