Improve resource details view
Fix some regressions