Cont. (working on toolbar and datagrid)