Swap to use view composer, instead of relying on the event.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'