Fixed the title and badge