Fix Appbar + removed unused nav code