fix some issues in screen 2
add icons