Fix capture screen layout issue with new navigator