Merge branch 'origin/aries'
lite lite
fix some small stuff
Merge branch 'origin/aries'
option and its navigation fixed
Merge branch 'JOY'