(#8) Updated layout, changed order for html upload