-- modernizr bug fix, overhauls prepData, starts Layout refactoring --