Mostly optimization made to menu