refactored layout
merge conflict solved