Added text entry and combo box