Added context menu
Added searching