User interface improvements part #2