layout update/refactoring