Improve default bundle controller and views