US530 - Styling updates. refactoring.