Code cleanups.
Created seperate Favorite and All settings tab.