added icons and organized things