added bootstrap modals
Small scope updates