Fix Buf master

More clean's code and fix Gossip menu