work on layout and routes