Fixing various bugs and css styling on data source page