Changed timeline design a bit