Added patterns
Rearranged buttons
Merge branch 'develop' into gh-pages