added buttons for categories
merging category buttons with john's images

Merge branch 'dev'