few small changes on folders and template links