fix ad entry bugs
change design of toolbox
Merge ecomaki.com:~/git/ecomaki