Fixed page layout and some clean-up