Added display, routing and controllers