Modified custom cell and scrollView