Updated views and dispatcher to match framework changes.