Update markup semantic, design and code highlight