timeline UI bugs
merge