Refactor/widgets and timeline

boom!