menu and fonts refactor