Added clean up method to ResourceViewers, and tweaked the UI