Hotfix: Reordered the layout after changing bounds on the cell for corre...

...ct ordering of calculations