Refactor views; add tags and search