Fixed more UI stuffs