Merged in all previous dashboard work