Fixes more Greendale issues - still WIP

Fixes some more Greendale issues in #1488. Still have some to go, so don't merge yet.

Think I've also managed to come up with a better isometric arrow so will also tackle #1601 at the same time.