fixed disabled arrows
Merge branch 'master' of https://github.com/socho/edx
Merge branch 'master' of https://github.com/socho/edx
cleaning up code