Refactor view locations cnt'd