Fix menu not appearing after switching to edit mode and back. Fix vault not working sometimes, I think.