more updates to view and controller