Improved DataSource Management Screen and messages