Much refactoring of styling