Several improvements to view workflow