Changed default ID field to string
Tidied up layouts
Merge branch 'feature/string-ids' into develop

* feature/string-ids:
  Tidied up layouts
  Changed default ID field to string