Fixed avatar not being clickable #613
Fixed exception being thrown when it wasnt needed
Merge branch 'bugfix613' into working
Fixed issue where main menu buttons wernt clickable