fix missing images
change to user state
final setup