Edit Timeline Form Changes

WIP - Squash