Feature/commands toolbar