input inmprovements, collapsedFolders default and saved
merge