Fix navigation in app