Imporvements to timeline, colors and buttons