layout refactoring
layout refactoring