Fix maths and use grid system value