Styling changes after merge