fix indentation to 2 spaces, freeze constants, improve checkbox layout o...

fix indentation to 2 spaces, freeze constants, improve checkbox layout on request form.  response to changes suggested by code review.