- Make defaults layout resources distinct from those in main
- Fix alignment of fields in defaults layout