Bug Fixes for Timeline and undos