Improve menu with more semantic html and simpler CSS
Fix indentation of HTML