Fixed New menu and few small things