Started fixing some styling errors that may have come out of the merge