Updated save navigation

This is not completed yet and so may cause some unexpected behaviours