modal display working
Merge branch 'modal-displayy' into development