Renamed time fields. Removed name from id fields.
Moved resources to seperate page.