Some layout improvements

I made some changes that

(1) reduces the amount of whitespace on the right
(2) closes a border gap on the lower right corner of the grid

Basically, it's only using right-border and accounts for it when calculating the inline row styles by subtracting 1 - keeping the model widths the same for correct offset.

Please consider reviewing it.