added UI etc
fixed some issues
uploader - not working yet