Some minor ui maintenance