[#479] Modified the markup and style to match requested visual changes

@kardan Can you code check?