Implemented new forms for creating and editing timeline
merge with alexzen