UI bug Fixed