Reverted to layer browsing, keeing Layer Name generation