Got rid of Term.h import
Back button to IndexAll fixed
Merge remote-tracking branch 'origin/dev' into sdm