Remove unused small modal code
Make modal footer close button and header X behaviour consistent
Tidy up modal HTML, fix ESC-to-close