added id's to form elements

Also some non-final rearrangement of the layout.