Clean things up a bit, make some things more messy. Layout testing can now be done with /debug/layouttest as the URL