Saved Search almost done, done some cleanup on main activity