PM: improve look + feel of toolkit