Fixed navigation

Finally :+1: