moved search item to separate file
some view refactoring
oops, forgot a file