Final implementations

Toggle featured fixed and added