fixed search, finished design layout