UI quick fixes