Added trim around layer names