fixed file upload and changed layouts