tweaked toolbar and fixed tracking version