markup changes and products sort
Merge branch 'dev' of github.com:winnlab/AgushaHuge into dev