Edit settings redirect to dashboard, other minor tweaks