Removed photo upload
Modularised forms