add Menu Title and Icon. Fix minor bugs