Fixed input issue, adjusted menu and ouput display