Fix DAO
Add new grafic layout
Add new tools