UI Enhancements for data Export and Import screens

Shouldn't be commited