shuffle things around
allow updating avatar
fix for ff