refactoring layout
refactor layout