Fixing some bugs, adjusting to fit pages