Added icons & File names clean-up