blocking out buttons
Merge branch 'feature-lib'