Updated bootstrap and controllers