ITTE-1159  Updated user interface. 

Fixed some input bigs that ocured.