Some refactoring and CSS styling.