Fixed toolbar and standardized it on mac & win