implemented menu highlighing and fixed other issues