Form fixes

Fixes the form so its not so large. Theres room to add more content here
as needed.