UI bug fixed, final version