Improved html again