Refactor/widgets and timeline