Features generate feature fix.
Moved elements to correct regions
Merge branch 'develop'