+ adjust header buttons
+ adjsut items
Merge branch 'develop' into gh-pages