Added timeline, changes to hover and focus status of snips
conflicts resolved