Fixed issue with two scroll bars appearing.

Fixed #644