removed switches and added All, My, Fav buttons