Issue 286-made all the necessary changes to toolbar