Fixed merge problems. Now info/error messages work. And timeline has zoombar.