Refactored stylesheet a little