Updated desing & markup