Improved markup and design