Joint: bugs and visual changes

Joint: bugs and visual changes #684