Production view refactoring and other views improvements