PDS - UX Improvements