Some fixes, Added skeleton of adapter for main menu