Get rid of hardcoded width
Alphabetical order
Add missing prefixes
CR comment addressed
Merge pull request #199 from Wikia/MWEB-635

Mweb 635