Removed odd labels when editing module.
Merge branch 'development' into 4.1
Fixed sort icon being off center. Added code for new reporting feature.