Remove merge conflict
Add circle images
add Welcome Home message for both large and small screens