Updated settings link and avatar