cleaned up things, moved to bootstrap modals