Making it more HTML5ey