Added imports for AssessmentControl

Since AssessmentControl was moved to a new package, I added the imports
in the required classes.
Changed Layout for main menu

Layout changed for main menu items.
Added propOrder to AssessFeedback

Added propOrder to AssessFeedback
Started work on options package and Procextension class
Fixing conflicts