Refine on demonstration

Graphics need to be separated from main class later.