Update Comm layout to use Chrome's new Classname.
Clean up imports a little.