Refactor modals, add 'register or login' modal