Refactor widoków