Booja: Cleaned up code to use proper container handlers and fixed issues with updating content