Additions to modal component