Very annoying UI bug fixed