finished toolbar logic
merge