Menu, notifications minor tweaks