Progressing on layout and routes