fixing bug #5891 by simplifying UI