view and controller fix