UI improved, final version