Avatar picture folder - bug fixes