Updated markup with correct title etc.