Implementing timeline with table - cleaned up