Last commit wasn't complete, final fix for self menu