Rewrote some styling to make use of v1.0.2