Small fixes
Updated Forms, lists, etc