ScreollerView Fixed.
Removed some TODOs