Fix less bugs WIP - Timeline section finished
Fix less bugs