Seperate the outerWidth/Height with margin and without margin cases @ericwright90
Rebuild