Bug fixing on UI