cleaned up forms for mobile