get rid of invalidateOptionsMenu & minor tweaks