Another set of incremental improvements. I added indexes to improve search speed and cleaned up redundant code to make the views and controllers a little nicer.