main contain
modified router and view