Move background rendering into superclass and add border