new data source buttons
panels
cleaner orgnization