Fix activation params
Clean up demo
Remember scroll position