Added Ally Menu + fixed bugs