Menu tweaks
functions updated