improved demo markup