Menu fonts, hover fixes, refactoring, clean up