Final additions for view and search function modifications. Closes #11 #10