Cleaned up some code, finished results view design (filters and sorting yet to be implemented).
Merge remote-tracking branch 'origin/master'
Merged changes.