Fixed: Save on edit now takes you back to previous state