Front-end fixes for demo