Move expression field to angularjas so that fields line up better.

Change-Id: Idd5ba503e74090c75492bb879fb2c3f473d35cd2