Fixed all issues w/ submit/unsubmit timeline