Move form elements to look better
Fix issue with days not being transmitted