Improve UI small-window-friendliness