Add ids to resources to allow for overriding

Added ids to all resources so that any resource can be more easily overridden if needed.

Also cleaned up some tabs vs. spaces issues to be more consistent.