Remove buttons that don't work.
Merge branch 'development' into current-sprint