Improved html/css organization for menu