Adjust page layout slightly; Clean up redundant codes