added an outline layer, shoved various things around to fit better