Added grid view and user selection of views.