Overall cleanup

Add working search functionality on first screen.