Better UI, some refactoring.