Revamping layout section
'fromIntegral' is over-rated