top streams, top menu refactor