Further work on UI and Grid Logic