Added painting in support frame
Fixed merge conflicts