Added update hint label + some refactoring.