merge conflicts
move upload form code to seperate file