Improve markup and configuration