Added style fixes