added checking for existed button
fixed timeline issues