Bug fix + added fork ribbon