added icons and wrapper up