Restore main page margin, fix some inspection errors

Change-Id: I8b2a1558b2a2a77df0c9f6d87a8cf302e60c3f78