Change design, prepare for demo