moving search to the header | cleaning up a bit