style / layout refactoring