Add avatar
Fix routing & security