refactoring layout
merging conflicts