Menu bar misc

NOT READY FOR MERGE