Redid finishing of layouts and routes