Refactored views for batch forms