More improvements on user interface