New feature types for 123 Portal

https://github.com/aodn/aodn-portal/issues/428

New feature types added.

Some tidy-up changes made by IntelliJ, too.