Centering issues

Same as yesterdays commit, but with formatting changes. Reopened, because the switch to public broke my fork.