Thesis: fix outer-inner margins, some cleanup