More Schema / html updates