Pushing updated Layout and many fixes to uploading