2nd Pass Borders

Changing the order of how the lines are drawn. You must have the right
order to get the proper bounds.