Correct width and height size logic and add div for extras.