fixed best_in_place issue, fixed toolbar functionality