Added Grid and Search to the GUI