Refactor interface/views