Better dirty checking and nicer help icons