Added emptyView and overflow check