Khaleel's Commit

Included GridView and ListView. . .