fixed up styles after merge