Fix dashboard and other views