renamed areas and first buttons (exp)
Merge branch 'master' of https://github.com/gradesystem/grade-console