Fixes #1002 and added minor fixes, move logo to uploads paht and uses real uploaded file extension