Serveral style fixes