Add enhanced validity to annual rate and years field.  Also add clear button.