edited styling
merge conflict, couldn't find the conflict though..