updated and clean up styles