Added picture and search bar
merge changes