Form tweaks
Clean up routes