Fixed page overflow issues