Fixed refreshing of grid
Fixed bug in error message
Minor perf improvements on loading