UI fix (unfinished)