Merge change 8098 into donut

* changes:
  cast is floor. Use round instead.  This fixes a few layout issues (that was due to smaller widnow size)