added icons and improved system in general