Feature/puzzle navigation