Tidied up view dispatching