Added border height to subtract in calc
CSS Layout fixes