CircularScrollView + minor fix