Feature/bootstrap

Adapt bootstarp feature to the new app.