Issue 1002

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