Work on menu, tweaks to other