Fixed issues with bootstrap modals