layout refactoring
layout improvements