Fixed the layout
Rearranges the samples

Fixed the links and rearranged the samples
Merge branch 'master' into gh-pages