moved the upload logo button into correct position.
fixed a couple of bugs found during testing.