added icons and resolving issues