set image background resize
created square logo background
working on search
Fixed merge conflict.
Fixed merge conflicts.