Add HTML5 Ruler + Fixes