Jf/viewer improvements