fix up screenshot and reorder togglemanager

Change-Id: Ibb36f7abfa67e6c40ad74dbdcafb454124de0eb7