Fix layout again

The main fix here is the last one which fixes the left margin issue.