Improve markup and appearance