Add depth to expand context button
Add bookmarked and resolved states to stream items