merge the files
add new layout
update the route name
adjust the layout