Form organization and fixes.