Improve HTML, no more fixed positioning