Fixed page scroll and approved bug