Bugfixing: redirecting after save/cancel is clicked