Made the design more MVC, still deciding how to correctly incorporate
search results.