Wrapper & minor CSS adjustments