Grid view is working again, removed loading text and re-structed the files