Fix small ui stuffs