Merge the modal module into windowing.  Fix some image links.