Added table for menu
Changed to HTML5 elements