Fixed menu
More checks to fix errors on user title