added popup to work.html, and made the navbar functional
fixed merge failures