~ cleaned and moved Grid to UI