Updated application and terminal to use edit controls