added dummy buttons
Merge branch 'dev' into design