activity navigation fixes