Removed comments
Changed icon for resource details
Fixed merge conflicts?