New modals, style improvements
merge upstream
translate user_modal.html