Added modal scaffolding