Spread view definitions out more