FB and badge fix