new civilian form (small tweaks)