Refactor view header + new controller & view