Refactor Contact scope and views