upload layout improved