Flatten timeline and GUI optimisations