Ready for  P3, slight fix to toolbar