Rework command classes, add action to buttons