Ended work with site for desktop versions (maybe include some bugs )
Merge branch 'master' into gh-pages