Adjust to some refactorings / Enhance resource displaying