more WIP routing, fixed images