Implement new button markup