updated toolbar and viewcontroller minor tweaks