Refactor layout views