Added legends to fieldsets
A couple of tweaks to be inline with design
A couple of tweaks to be inline with design