stable WIP plus universal toolbar