Fixed Formating
(BROKEN) - Add logic for GRIDVIEW