RC: favorite contact
move toggles per row up

Change-Id: I3f0d16b8b6c7efe61aa31063674ac188a5b6d1d3
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
RC: move navbar string to correct location

Change-Id: If621aa891b50ed3c491830e80abc02a4d1ba24fb
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>