Improved custom rendering design
Moving & splitting design file