Reverting back to buttons

Merged Philip Müller requested to merge sanchitsamuel:ux_improvement into master

Created by: sanchitsamuel

Merge request reports