Improved markup & stylesheet