further work on uploads
small rename
showborders fix