Small fix in UI still incomplete