changed assets and fixes menu screen
merge