Some esthetics changes