Take borders into account when using relayout