Added some comments, changed grid view