Fixed issues with scrolling, ScalableImageView removed