Change context to context list
Bug fix for context list
Modify NewNextButton
Merge branch 'master' of https://github.com/xgjonathan/NEXP