Structured data and a bit more markup

Change-Id: I783a5f0ca5035ff1f8be827b34318218d0ab1cca