Add partial layout forms, simplified navigation via match and setup navigation links