changes regular expression to allow 0 in typeblocks

Change-Id: Ia34361d03d788149c60b630779362f0721f64c51
Fix Overlap of elements in Horizontal Arrangement.

Change-Id: I7d3cf0f35ed941fc8650ce9724db1cf06d6818e3