Highlight and timePicker fix

Highlight fixed!

Fixed highlight without the use of including a ng-if directive.  Also
ngIf was effecting the sync of the timePicker, which now works perfectly
when input is changed as well