1001-1323

Adjustments to better support Input font

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>