Added ability to choose avatar