Add AvalonEdit toolbar and some fixes