Minor UI issues fixed for demo.