add toolbar
merge from jonathan
fixing merge menu left manual
add fill div filter