Fix controller and page display