Switched to tree view; cleaned up.