Some enhacements in styles