All the changes that are related to html change, will be included on phase 2, after archery style and sub-module is completely integrated. Until then, I can't test the change, unless I move everything back to the site.