changed search bar size
merge confilts fixed