Refactoring layout
Resolved conflict