Removed Views and replaced with List