Updated design and fixed markup