Place fix and folder presentation improvement