Moved logic to enum. Fix bug causing lessons kbd not to be updated
Fixed bug causing strange things when Hide/Show was pressed
Fixed bug causing spurious parse errors
Merge branch 'master' into next