Refactoring post new layout