re aligned options menu form components
comments and minor refactoring