Cleaned up views and routing for new forms