User interface improvements part #3