added rest graphics and paints. Simple reformating code