nav and like fixes