Tidied up the bounding boxes and ports

Now ports are inside the router.

It's really hard to think about layout stuff like this. I wish I had
thought about how to do 'concave' (?) collision before as it might have
influenced my design.