Add iscroll and fixes