#13: Added logic and UI for Providers