Fix names
Add active attribute
Generate forms based on DB