Active class and clean up view a bit
This is what we really want.
Move relation up the chain - we want this to occur first.