A few fixes to demo and hardcoded css