Cleaned up this form a little to make it more consistent