Merge branch 'sachin' into dillanbutler
Render table change

table button now shows the ui as well and can switch back and forth
form graph and table buttons with a problem
Merge branch 'dillanbutler' into sachin