Merge "Refactor common layout"