Move dependency injection to controller construct.

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

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