Implement search capability & refactor views