Improve body background and border rendering (Fixes #556)