add view, and map controller actions to view
fix merge conflict