Get rid of the decimals
Use the container size.
Merge branch 'test' into dev