added buttons to replace nav links
Merge branch 'staging'