-Fix issue where tables were not getting updated when background and/or foreground got updated
-Cleanup