Include request data, Tests for controller and Better layout