Updates to modal and stuff