Clean up and corrected the margins and line height a bit more