add new layout
refactoring layout