Switched to HTML5 and improved styling