Refactored object and timeline views.