form design
fix conflicts
fix database
fix database
minor changes for projects
minor changes for projects