Fixed annoying navigation issue
Last update before presentation