Restructured angular app. Began implementing bootstrap modals