Refactor markup and add block title.