add new assets
add new screens
refactoring