Update TODO; removed grid button