Fix task and add view handler.