Add correct page margins and much more little improvements