Move transitions to after save

Added Loading and Error routes as well