Improved html architecture #12