Added referesh menu item
Allow control over individual streams
Clean up some TODOs