Fix navigation in app pages