Fix timeline and initialization bugs

Also add overlay icons.