more updates to  layout and routes