more toolbar and link changes
more toolbar and link changes