indentation and folder entry class enhancements