a few tweaks to get fields and actions lining up properly