Refactor view locations