Add submit button and search in sidebar
resolve conflicts with Chris