Added more view stuff