Fixed up the UI considerably for demo