Final version

Component updated and UI improved.