refactor layout
refactor layout