Menu tweaks per facelessuser and aziz requests