GPII-118: Added buttons to replace controls