modified control class navigation
Merge branch 'master' of https://github.com/davcri/Unibox.git