Width is now being properly calculated