Add METRO form hackery.
Goof and code review changes.
Merge pull request #3 from jordandukart/7.x-METRO-54

Add METRO form hackery.