Issue: Cta theming, icons added, bug fixes