Some improvements added to the visual part.