Added timeline prototype

Applied some fixes