Tidy of new entity specific settings UI