Fixed a bug on create new folders and made the folders collapse/expandable manually