Finish layout and routes with extras