Added graphical elements and rendering + reorganized the samples