Expand on modal functionality