Bug Fixes

Fixed problem calculating target width after resizing it to fit the
scrollbar