Fixed layout of search containers and redid search screen