Added searching and viewing toggle