cleaned up and simplified navigation, fixed location.href when saving properties