Cleaning up code and bug fixes

TimeLine position was not updating