Edit Menu and Fix bugs