consistent submit button styles; layout changes