AJ-1573 Some UI improvements, add points remaining warnings.