Fixed poor placement of form elements