Fixes for avatar uploading and more stablility when multiple forms on page