Refactor layout features