(refs #3607) Improve look