cleanup in overlay small bugfix in toolbar