Moving buttons into a template. Changing to an event bus for commands.