Added fields to main form, css tweaks