fixed some style conflicts