added indents and change order of views, still looking for upload bug