Making things line up properly